Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

core: implement etcs braking simulator for EOAs #10014

Merged
merged 1 commit into from
Jan 15, 2025
Merged

core: implement etcs braking simulator for EOAs #10014

merged 1 commit into from
Jan 15, 2025
+517 −70

Conversation

Erashin
Copy link
Contributor

@Erashin Erashin commented Dec 10, 2024 •
edited
Loading

Restriction: in the end, only implement EOA part of the ETCS braking curves (without any behavior change for SVLs).

@github-actions github-actions bot added the area:core Work on Core Service label Dec 10, 2024
@Erashin Erashin linked an issue Dec 10, 2024 that may be closed by this pull request
core: implement ETCS module interface to compute ETCS braking curves for EOAs #9704
Closed
@Erashin Erashin requested review from eckter and bougue-pe December 10, 2024 16:44
@codecov-commenter
Copy link

codecov-commenter commented Dec 10, 2024 •
edited
Loading

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.63%. Comparing base (cf771fa) to head (61f6cc8).
Report is 5 commits behind head on dev.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files 
@@            Coverage Diff             @@
##              dev   #10014      +/-   ##
==========================================
- Coverage   81.65%   81.63%   -0.03%     
==========================================
  Files        1066     1066              
  Lines      105692   105736      +44     
  Branches      727      727              
==========================================
+ Hits        86299    86313      +14     
- Misses      19352    19382      +30     
  Partials       41       41
Flag Coverage Δ
editoast 73.63% <ø> (-0.07%) ⬇️
front 89.33% <ø> (+<0.01%) ⬆️
gateway 2.18% <ø> (ø)
osrdyne 3.28% <ø> (ø)
railjson_generator 87.50% <ø> (ø)
tests 87.05% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Erashin Erashin force-pushed the alch/core/etcs_use_physics_path branch from 084a5b0 to 7743dca Compare December 13, 2024 11:34
@Erashin Erashin force-pushed the alch/core/etcs_use_physics_path branch 9 times, most recently from c5f57f8 to cb6893a Compare January 10, 2025 10:11
eckter
eckter reviewed Jan 10, 2025
View reviewed changes
Copy link
Contributor

@eckter eckter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not done yet with the review, but 'll do the rest later on, I can comment what I have

core/envelope-sim/src/main/java/fr/sncf/osrd/envelope/part/EnvelopePart.java Outdated Show resolved Hide resolved
core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/EnvelopeSimPath.java Show resolved Hide resolved
core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/PhysicsRollingStock.java Outdated Show resolved Hide resolved
core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/TrainPhysicsIntegrator.java Show resolved Hide resolved
@Erashin Erashin force-pushed the alch/core/etcs_use_physics_path branch 2 times, most recently from bbbd885 to 6d85230 Compare January 13, 2025 09:29
@Erashin Erashin changed the title core: implement etcs braking simulator core: implement etcs braking simulator for EOAs Jan 13, 2025
bougue-pe
bougue-pe reviewed Jan 13, 2025
View reviewed changes
Copy link
Contributor

@bougue-pe bougue-pe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ETCSBrakingCurves.kt is out of the scope for this review 😅

core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/PhysicsRollingStock.java Outdated Show resolved Hide resolved
core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/TrainPhysicsIntegrator.java Show resolved Hide resolved
core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/TrainPhysicsIntegrator.java Outdated Show resolved Hide resolved
core/envelope-sim/src/testFixtures/java/fr/sncf/osrd/envelope_sim/SimpleRollingStock.java Outdated Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/train/RollingStock.java Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/train/RollingStock.java Outdated Show resolved Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingSimulator.kt Show resolved Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingSimulator.kt Show resolved Hide resolved
core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/EnvelopeSimPath.java Show resolved Hide resolved
core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/PhysicsRollingStock.java Outdated Show resolved Hide resolved
@Erashin Erashin marked this pull request as ready for review January 13, 2025 15:27
@Erashin Erashin requested a review from a team as a code owner January 13, 2025 15:27
@Erashin Erashin requested a review from eckter January 13, 2025 15:27
bougue-pe
bougue-pe reviewed Jan 13, 2025
View reviewed changes
Copy link
Contributor

@bougue-pe bougue-pe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great first step for the ERTMS 👣
Nice job, just little questions remaining on the formulas, but it should be fine to track them (maybe in the ERA xls file?).
🎉

...srd-railjson/src/main/java/fr/sncf/osrd/railjson/schema/rollingstock/RJSEtcsBrakeParams.java Outdated Show resolved Hide resolved
...srd-railjson/src/main/java/fr/sncf/osrd/railjson/schema/rollingstock/RJSEtcsBrakeParams.java Outdated Show resolved Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt Outdated Show resolved Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt Outdated Show resolved Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt Outdated Show resolved Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt Outdated Show resolved Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt Outdated Show resolved Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt Show resolved Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt Show resolved Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/Constants.kt Show resolved Hide resolved
@Erashin Erashin force-pushed the alch/core/etcs_use_physics_path branch 4 times, most recently from 5997a2e to 63bc543 Compare January 14, 2025 11:36
@Erashin Erashin force-pushed the alch/core/etcs_use_physics_path branch from 63bc543 to 083e382 Compare January 14, 2025 14:12
@eckter eckter force-pushed the alch/core/etcs_use_physics_path branch from 0a34dda to 083e382 Compare January 14, 2025 14:41
@Erashin Erashin force-pushed the alch/core/etcs_use_physics_path branch 3 times, most recently from 9d0af55 to 8febc05 Compare January 14, 2025 15:07
eckter
eckter approved these changes Jan 14, 2025
View reviewed changes
Copy link
Contributor

@eckter eckter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice

@Erashin Erashin force-pushed the alch/core/etcs_use_physics_path branch 4 times, most recently from 6fe9bff to 3adb1dc Compare January 15, 2025 10:35
bougue-pe
bougue-pe approved these changes Jan 15, 2025
View reviewed changes
Copy link
Contributor

@bougue-pe bougue-pe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noiiice !
Integration tests to be done in a separate PR #10294

...srd-railjson/src/main/java/fr/sncf/osrd/railjson/schema/rollingstock/RJSEtcsBrakeParams.java Outdated Show resolved Hide resolved
@Erashin Erashin force-pushed the alch/core/etcs_use_physics_path branch from 3adb1dc to 61f6cc8 Compare January 15, 2025 10:43
@Erashin Erashin enabled auto-merge January 15, 2025 10:43
@Erashin Erashin added this pull request to the merge queue Jan 15, 2025
Merged via the queue into dev with commit 675d279 Jan 15, 2025
27 checks passed
@Erashin Erashin deleted the alch/core/etcs_use_physics_path branch January 15, 2025 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bougue-pe bougue-pe bougue-pe approved these changes

@eckter eckter eckter approved these changes

Assignees
No one assigned
Labels
area:core Work on Core Service
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

core: implement ETCS module interface to compute ETCS braking curves for EOAs
4 participants
@Erashin @codecov-commenter @eckter @bougue-pe